From eeef489ff8384f39ee947408204cb4cb13c97b2f Mon Sep 17 00:00:00 2001
From: "Jan D." <jan.h.d@swipnet.se>
Date: Tue, 8 Oct 2013 08:12:40 +0200
Subject: [PATCH] * nsterm.m (windowDidExitFullScreen:): (toggleFullScreen:):
 Change NS_IMPL_COCOA to HAVE_NATIVE_FS.

---
 src/ChangeLog | 5 +++++
 src/nsterm.m  | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 7c53b21815b..4a109fda81a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsterm.m (windowDidExitFullScreen:):
+	(toggleFullScreen:): Change NS_IMPL_COCOA to HAVE_NATIVE_FS.
+
 2013-10-08  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Fix race where emacs aborts when sent SIGTERM (Bug#15534).
diff --git a/src/nsterm.m b/src/nsterm.m
index f166aba2e1a..ce8d9b2106a 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6160,7 +6160,7 @@ if (cols > 0 && rows > 0)
 {
   [self setFSValue: fs_before_fs];
   fs_before_fs = -1;
-#ifdef NS_IMPL_COCOA
+#ifdef HAVE_NATIVE_FS
   [self updateCollectionBehaviour];
 #endif
   if (FRAME_EXTERNAL_TOOL_BAR (emacsframe))
@@ -6221,7 +6221,7 @@ if (cols > 0 && rows > 0)
 
   if (fs_is_native)
     {
-#ifdef NS_IMPL_COCOA
+#ifdef HAVE_NATIVE_FS
       [[self window] toggleFullScreen:sender];
 #endif
       return;
-- 
2.30.2